Accept unnamed separators. (#369112, Christian Persch)

2007-04-26  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept
        unnamed separators.  (#369112, Christian Persch)

svn path=/trunk/; revision=17649

diff --git a/ChangeLog b/ChangeLog
index ead4d45fe2131e8174c563e5ac75fa8906018b01..bd50b7c7bf7902262237ac15bf553674d204dc1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept
+       unnamed separators.  (#369112, Christian Persch)
+
 2007-04-26  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_finalize): Don't access

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 041adad374fd4bd7f6f77048674b6e2f7a80fb14..529c296035b509a9ce413239a8d0b2d905af24f4 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1609,7 +1609,7 @@ gtk_ui_manager_add_ui (GtkUIManager        *self,
 
   g_return_if_fail (GTK_IS_UI_MANAGER (self));  
   g_return_if_fail (merge_id > 0);
-  g_return_if_fail (name != NULL);
+  g_return_if_fail (name != NULL || type == GTK_UI_MANAGER_SEPARATOR);
 
   node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE);
   sibling = NULL;
@@ -1710,7 +1710,7 @@ gtk_ui_manager_add_ui (GtkUIManager        *self,
     }
    
   child = get_child_node (self, node, sibling,
-                         name, strlen (name),
+                         name, name ? strlen (name) : 0,
                          node_type, TRUE, top);
 
   if (action != NULL)